dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f0f91f2 1d35a4a)

author	Glenn Morris <rgm@gnu.org>
	Sat, 14 Apr 2012 01:46:06 +0000 (18:46 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 14 Apr 2012 01:46:06 +0000 (18:46 -0700)
commit	bf9d823f47fd1937e07314ce5c5ab6e1de4da337
tree	f9cdd3366945bcc1dbb0ebbfb7714df7d06b51a2	tree \| snapshot
parent	f0f91f2889cc936063e350ff5d327cd602879793	commit \| diff
parent	1d35a4a3fe4dc3969489259a23f76f837724a004	commit \| diff

Merge from emacs-24, up to r107825

25 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispintro/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/customize.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/help.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/minibuf.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/processes.texi	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/custom.el	diff1 \|	diff2 \|	blob \| history
lisp/emulation/cua-base.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/minibuffer.el	diff1 \|	diff2 \|	blob \| history
lisp/net/rcirc.el	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	diff1 \|	diff2 \|	blob \| history
lisp/textmodes/ispell.el	diff1 \|	diff2 \|	blob \| history
nt/ChangeLog	diff1 \|	diff2 \|	blob \| history
nt/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/lread.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.